Improve AWS Query compatible error handling in unmarshallers #4253
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
peterrsongg
reviewed
Dec 19, 2025
Contributor
peterrsongg
left a comment
peterrsongg
left a comment
There was a problem hiding this comment.
Verified it works in a console app myself. approved.
peterrsongg
reviewed
Dec 19, 2025
peterrsongg
approved these changes
Dec 22, 2025
GarrettBeatty
approved these changes
Dec 22, 2025
Contributor
There was a problem hiding this comment.
Pull request overview
This PR refactors AWS Query compatible error handling in unmarshallers to improve code organization and eliminate duplication. The key change moves error code/type extraction from the AWS Query compatible header to occur earlier in the unmarshalling process and directly updates the errorResponse object, which allows removal of redundant AWS Query compatible checks from individual exception unmarshallers.
- Consolidated AWS Query compatible error code/type extraction to occur once per response instead of per exception
- Eliminated duplicate AWS Query compatible logic from individual exception unmarshallers
- Introduced
errorTypeNamevariable to preserve the original error code for exception matching before AWS Query header override
Reviewed changes
Copilot reviewed 7 out of 117 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseResponseUnmarshaller.tt | Updated AWS Query compatible block to directly modify errorResponse.Code and errorResponse.Type |
| generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCResponseUnmarshaller.tt | Moved AWS Query compatible block before exception matching and introduced errorTypeName variable |
| generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCExceptionUnmarshaller.tt | Removed duplicate AWS Query compatible logic from exception unmarshallers |
| sdk/src/Services/SQS/Generated/Model/Internal/MarshallTransformations/* | Applied template changes to all SQS response unmarshallers |
| sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/* | Applied template changes to all CloudWatch response unmarshallers |
| sdk/test/Services/QueryCompatible*/Generated/Model/Internal/MarshallTransformations/* | Applied template changes to test service unmarshallers |
| generator/.DevConfigs/78714232-60db-41f4-8696-7764cc7bd5c9.json | Added dev config with patch version bump for SQS and CloudWatch |
muhammad-othman
merged commit c472345
into
aws-sdk-net-v3.7-development
9 of 10 checks passed
muhammad-othman
deleted the
muhamoth/DOTNET-8439-v3-bug-AWS-Query-protocol-migration-compatibility
branch
10 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Modified error response unmarshalling to directly update errorResponse object instead of using intermediate variables. For AWS Query compatible services, error codes are now extracted and set on the errorResponse object within the generate AWSQueryCompatibleBlock, this allowed us to remove conditional AWS Query compatible checks in
JsonRPCExceptionUnmarshallersince theerrorResponsealready contains the proper code and type.Motivation and Context
DOTNET-8439Testing
DRY_RUN-71a1a982-8709-48d3-a99a-c6d4c5251dd8Screenshots (if appropriate)
Types of changes
Checklist
License